diff options
| author | Adam Soltys <[email protected]> | 2023-12-06 20:33:45 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2023-12-06 20:33:45 -0800 |
| commit | 6b3ff247e4125941a611369ed9bb74a2ffca57d8 (patch) | |
| tree | 91da939350398188834e5e002bc78011a2a8e5bf /src/routes/(app)/[username]/generate | |
| parent | bb59ac3e4e7fcbf7f8a48820eab0ee21558183fc (diff) | |
| parent | d69c34cf389639eac82d24d1f1b02f038ef42399 (diff) | |
| download | coinos-ui-6b3ff247e4125941a611369ed9bb74a2ffca57d8.tar.gz coinos-ui-6b3ff247e4125941a611369ed9bb74a2ffca57d8.zip | |
Merge branch 'master' into swapee
Diffstat (limited to 'src/routes/(app)/[username]/generate')
| -rw-r--r-- | src/routes/(app)/[username]/generate/+page.svelte | 90 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/generate/+server.js | 16 |
2 files changed, 53 insertions, 53 deletions
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte index b9274434..71f828dc 100644 --- a/src/routes/(app)/[username]/generate/+page.svelte +++ b/src/routes/(app)/[username]/generate/+page.svelte @@ -1,62 +1,62 @@ <script> - import { fail, post, wait } from '$lib/utils'; - import { onMount } from 'svelte'; - import { goto, invalidate } from '$app/navigation'; - import { Pin } from '$comp'; - import { loginRedirect, pin, password, passwordPrompt } from '$lib/store'; - import { generate } from '$lib/nostr'; - import { browser } from '$app/environment'; + import { fail, post, wait } from "$lib/utils"; + import { onMount } from "svelte"; + import { goto, invalidate } from "$app/navigation"; + import Pin from "$comp/Pin.svelte"; + import { loginRedirect, pin, password, passwordPrompt } from "$lib/store"; + import { generate } from "$lib/nostr"; + import { browser } from "$app/environment"; - export let data; - let { user } = data; + export let data; + let { user } = data; - let loaded; - let gen = async () => { - if (!browser) return; + let loaded; + let gen = async () => { + if (!browser) return; - if (user.pubkey) { - goto($loginRedirect || `/${user.username}`, { invalidateAll: true }); - return; - } + if (user.pubkey) { + goto($loginRedirect || `/${user.username}`, { invalidateAll: true }); + return; + } - if (!$password) $passwordPrompt = true; + if (!$password) $passwordPrompt = true; - try { - await post('/password', { password: $password }); - } catch (e) { - $passwordPrompt = true; - } + try { + await post("/password", { password: $password }); + } catch (e) { + $passwordPrompt = true; + } - await wait(() => $password); + await wait(() => $password); - try { - await generate(user); - } catch (e) { - console.log('error generating', e); - } + try { + await generate(user); + } catch (e) { + console.log("error generating", e); + } - try { - user.pin = $pin; - await post(`/${user.username}/generate`, user); - goto($loginRedirect || `/${user.username}`, { invalidateAll: true }); - } catch (e) { - $pin = ''; - if (e.message?.startsWith('Pin')) { - fail('Wrong pin, try again'); - } else { - fail('Failed to generate keys'); - goto('/'); - } - } - }; + try { + user.pin = $pin; + await post(`/${user.username}/generate`, user); + goto($loginRedirect || `/${user.username}`, { invalidateAll: true }); + } catch (e) { + $pin = ""; + if (e.message?.startsWith("Pin")) { + fail("Wrong pin, try again"); + } else { + fail("Failed to generate keys"); + goto("/"); + } + } + }; - onMount(() => browser && setTimeout(() => (loaded = true) && gen(), 50)); + onMount(() => browser && setTimeout(() => (loaded = true) && gen(), 50)); - $: $pin?.length === 6 && gen(user); + $: $pin?.length === 6 && gen(user); </script> {#if loaded && user?.haspin && $pin?.length !== 6} - <Pin /> + <Pin /> {/if} {loaded} {JSON.stringify(user)} diff --git a/src/routes/(app)/[username]/generate/+server.js b/src/routes/(app)/[username]/generate/+server.js index e1df08e3..1dca1ece 100644 --- a/src/routes/(app)/[username]/generate/+server.js +++ b/src/routes/(app)/[username]/generate/+server.js @@ -1,11 +1,11 @@ -import { auth, post } from '$lib/utils'; -import { error, json } from '@sveltejs/kit'; +import { auth, post } from "$lib/utils"; +import { error, json } from "@sveltejs/kit"; export async function POST({ cookies, request }) { - try { - let body = await request.json(); - return json(await post(`/user`, body, auth(cookies))); - } catch (e) { - throw error(500, e.message); - } + try { + let body = await request.json(); + return json(await post(`/user`, body, auth(cookies))); + } catch (e) { + throw error(500, e.message); + } } |
